Fixed the linux timing bug - just needed an updated libvpx. Change-Id: I361a9e86f0ed1fcc4e49d3a33b942a33796e37f6
diff --git a/README b/README index 9ed8a48..3a0d90b 100644 --- a/README +++ b/README
@@ -44,6 +44,5 @@ TODO: - Use gyp files to create .sln and eclipse project files. - - Fix timing bug on linux in V4L2. - Take file output name as an input parameter. - Create makefiles to allow building from command line \ No newline at end of file
diff --git a/src/videocapturer.cc b/src/videocapturer.cc index 852fe1c..f04e91c 100644 --- a/src/videocapturer.cc +++ b/src/videocapturer.cc
@@ -87,7 +87,7 @@ void VideoCapturer::MaybeCleanUpAndFail(bool should_fail, string error_message) { if (should_fail) { - LOG("Failed while %s and error code '%d'", error_message.c_str(), errno); + LOG("ERROR: '%s', Error code '%d'", error_message.c_str(), errno); CleanUp(); exit(EXIT_FAILURE); } diff --git a/src/videocapturerother.cc b/src/videocapturerother.cc index 4da2264..97a065c 100644 --- a/src/videocapturerother.cc +++ b/src/videocapturerother.cc
@@ -118,11 +118,6 @@ raw_->d_w, raw_->d_h); } - // A temporary and very hacky way of getting around a bug where - // ioctl(fd_, VIDIOC_QBUF, &buf) randomly returns error EINVAL. - // TODO: fix - usleep(100000); - MaybeCleanUpAndFail(ioctl(fd_, VIDIOC_QBUF, &buf) < 0, "Failed putting buffer back");
diff --git a/unixlibs/libvpx.a b/unixlibs/libvpx.a index 9fcc2be..7288709 100644 --- a/unixlibs/libvpx.a +++ b/unixlibs/libvpx.a Binary files differ
